Merged by hand.
authormaf46@burn.cl.cam.ac.uk <maf46@burn.cl.cam.ac.uk>
Tue, 19 Jul 2005 12:20:24 +0000 (12:20 +0000)
committermaf46@burn.cl.cam.ac.uk <maf46@burn.cl.cam.ac.uk>
Tue, 19 Jul 2005 12:20:24 +0000 (12:20 +0000)

Trivial merge